gstmedia: Ensure we prepare files without duration
authorBenjamin Otte <otte@redhat.com>
Mon, 29 Mar 2021 15:03:33 +0000 (17:03 +0200)
committerBenjamin Otte <otte@redhat.com>
Mon, 29 Mar 2021 15:08:34 +0000 (17:08 +0200)
In particular this fixes playback of images.

Fixes #3810

modules/media/gtkgstmediafile.c

index 6382f3b10aeb26e37379788c9e184eb8be77c400..7edc682e9c29d4ed459eb78a9fee1bf6b9a48267 100644 (file)
@@ -126,11 +126,27 @@ g_io_module_query (void)
   return g_strdupv (eps);
 }
 
+static void
+gtk_gst_media_file_ensure_prepared (GtkGstMediaFile *self,
+                                    gint64           duration)
+{
+  if (gtk_media_stream_is_prepared (GTK_MEDIA_STREAM (self)))
+    return;
+
+  gtk_media_stream_prepared (GTK_MEDIA_STREAM (self),
+                             TRUE,
+                             TRUE,
+                             TRUE,
+                             duration);
+}
+
 static void
 gtk_gst_media_file_position_updated_cb (GstPlayer       *player,
                                         GstClockTime     time,
                                         GtkGstMediaFile *self)
 {
+  gtk_gst_media_file_ensure_prepared (self, 0);
+
   gtk_media_stream_update (GTK_MEDIA_STREAM (self), FROM_GST_TIME (time));
 }
 
@@ -139,14 +155,7 @@ gtk_gst_media_file_duration_changed_cb (GstPlayer       *player,
                                         GstClockTime     duration,
                                         GtkGstMediaFile *self)
 {
-  if (gtk_media_stream_is_prepared (GTK_MEDIA_STREAM (self)))
-    return;
-
-  gtk_media_stream_prepared (GTK_MEDIA_STREAM (self),
-                             TRUE,
-                             TRUE,
-                             TRUE,
-                             FROM_GST_TIME (duration));
+  gtk_gst_media_file_ensure_prepared (self, FROM_GST_TIME (duration));
 }
 
 static void
@@ -176,6 +185,8 @@ static void
 gtk_gst_media_file_end_of_stream_cb (GstPlayer       *player,
                                      GtkGstMediaFile *self)
 {
+  gtk_gst_media_file_ensure_prepared (self, 0);
+
   if (gtk_media_stream_get_ended (GTK_MEDIA_STREAM (self)))
     return;